Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 06:43:05 +0000 (06:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 06:43:05 +0000 (06:43 +0000)

Trivial merge